Merge CICE-Consortium main #23a8faf Jan 25, 2023 to E3SM Icepack #19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rm1 and therm2 (CICE-Consortium#423) * Refactor isotope implementation with respect to optional arguments - Use argcheck design - Eliminate local copies of optional data - Pass optional arguments down the calling tree - Some minor format cleanup * - Continue update of isotope implementation in Icepack including HDO_ocn, H2_16O_ocn, H2_18O_ocn - Modify fsloss optional argument implementation - Modify rsnwn, smicen, smliqn optional argument implementation * - Update fswtrhu_[vi]d[fr] optional argument implementation - Clean up some formatting * Create icepack_chkoptargflag function for optional argument checking
The Makefile macro file for conda on Linux was not updated when Icepack learned to do NetCDF output in e1f3574 (Netcdf History Capability (CICE-Consortium#368), 2021-08-30), on the macOS one was updated. Tweak the Linux build similarly.
…o e3smicep230125 Merge CICE-Consortium main #23a8faf Jan 25, 2023 to E3SM Icepack
eclare108213
approved these changes
Jan 25, 2023
eclare108213
merged commit ef7491f
into
E3SM-Project:cice-consortium/E3SM-icepack-initial-integration
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR checklist
Merge CICE-Consortium main #23a8faf Jan 25, 2023 to E3SM Icepack
apcraig
Full test suite run on cheyenne with intel, gnu, and pgi with Icepack and CICE (using apcraig/E3SMIcepackDEV branch). Icepack is bit-for-bit against Icepack Consortium main #3a4d02e6e2 except for modal tests (expected). CICE is bit-for-bit in log files with CICE Consortium main #f813294108.